diff --git a/system/core/Common.php b/system/core/Common.php
index ee5a705..f28272b 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -741,6 +741,11 @@
 	 */
 	function html_escape($var, $double_encode = TRUE)
 	{
+		if (empty($var))
+		{
+			return $var;
+		}
+		
 		if (is_array($var))
 		{
 			return array_map('html_escape', $var, array_fill(0, count($var), $double_encode));